681a5e71bd1e114c34b745c00454372d6d21c498,mrgeo-core/src/main/java/org/mrgeo/aggregators/MeanAggregator.java,MeanAggregator,aggregate,#number[][]#number#number#number#,113

Before Change


    float s0;
    float s1;

    if (Float.compare(values[0][0], nodata) == 0)
    {
      s0 = values[0][1];
    }
    else if (Float.compare(values[0][1], nodata) == 0)
    {
      s0 = values[0][0];
    }
    else
    {
      s0 = (float) ((values[0][1] - values[0][0]) * weightx + values[0][0]);
    }

    if (Float.compare(values[1][0], nodata) == 0)
    {
      s1 = values[1][1];
    }
    else if (Float.compare(values[1][1], nodata) == 0)
    {
      s1 = values[1][0];
    }
    else
    {
      s1 = (float) ((values[1][1] - values[1][0]) * weightx + values[1][0]);
    }


    if (Float.compare(s0, nodata) == 0)
    {
      return s1;
    }
    else if (Float.compare(s1, nodata) == 0)
    {
      return s0;
    }

After Change


    float s0;
    float s1;

    if (FloatUtils.isNotNodata(values[0][0], nodata))
    {
      s0 = values[0][1];
    }
    else if (FloatUtils.isNotNodata(values[0][1], nodata))
    {
      s0 = values[0][0];
    }
    else
    {
      s0 = (float) ((values[0][1] - values[0][0]) * weightx + values[0][0]);
    }

    if (FloatUtils.isNotNodata(values[1][0], nodata))
    {
      s1 = values[1][1];
    }
    else if (FloatUtils.isNotNodata(values[1][1], nodata))
    {
      s1 = values[1][0];
    }
    else
    {
      s1 = (float) ((values[1][1] - values[1][0]) * weightx + values[1][0]);
    }


    if (FloatUtils.isNotNodata(s0, nodata))
    {
      return s1;
    }
    else if (FloatUtils.isNotNodata(s1, nodata))
    {
      return s0;
    }